bitkeeper revision 1.18 (3e33c6cdMqnqQnkIxpq_9HHmWHAHfA)
authorbd240@boulderdash.cl.cam.ac.uk <bd240@boulderdash.cl.cam.ac.uk>
Sun, 26 Jan 2003 11:30:21 +0000 (11:30 +0000)
committerbd240@boulderdash.cl.cam.ac.uk <bd240@boulderdash.cl.cam.ac.uk>
Sun, 26 Jan 2003 11:30:21 +0000 (11:30 +0000)
Merge boulderdash.cl.cam.ac.uk:/usr/groups/xeno/BK/xeno
into boulderdash.cl.cam.ac.uk:/local/scratch/bd240/xeno

1  2 
.rootkeys
BitKeeper/etc/logging_ok
xen-2.4.16/common/domain.c
xen-2.4.16/common/memory.c

diff --cc .rootkeys
Simple merge
index af88da45af7b8ffa5d076112f58f9227df62b026,9164d8ac247ba3d564973099a2507ae96b86dc9d..2fd8b201d7ed578ae7a7a777a56b8d4cb2316680
@@@ -1,6 -1,6 +1,7 @@@
  akw27@boulderdash.cl.cam.ac.uk
  akw27@labyrinth.cl.cam.ac.uk
 +bd240@boulderdash.cl.cam.ac.uk
+ iap10@labyrinth.cl.cam.ac.uk
  kaf24@labyrinth.cl.cam.ac.uk
  kaf24@plym.cl.cam.ac.uk
  kaf24@striker.cl.cam.ac.uk
Simple merge
Simple merge